From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Aug 2013 22:41:35 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=16d3c3f7e50f4462cd60ac78b86001fd074ea551;p=emacs.git

merge from trunk
---

16d3c3f7e50f4462cd60ac78b86001fd074ea551